Merged.

diff --cc tools/python/xen/xend/server/event.py
index bf0521c7645ba94a1e696b684f2131208d8ad90f,bf0521c7645ba94a1e696b684f2131208d8ad90f..359f774cf72ba914677eb7bad174784ca0806c34
--- 1/tools/python/xen/xend/server/event.py
--- 2/tools/python/xen/xend/server/event.py
+++ b/tools/python/xen/xend/server/event.py
@@@ -185,11 -185,11 +185,13 @@@ class EventFactory(protocol.ServerFacto
          return EventProtocol(self.daemon)
  
  def listenEvent(daemon):
--    factory = EventFactory(daemon)
--    if xroot.get_xend_unix_server():
--        path = '/var/lib/xend/event-socket'
--        unix.listenUNIX(path, factory)
--    if xroot.get_xend_http_server():
--        port = xroot.get_xend_event_port()
--        interface = xroot.get_xend_address()
--        tcp.listenTCP(port, factory, interface=interface)
++    pass
++
++#     factory = EventFactory(daemon)
++#     if xroot.get_xend_unix_server():
++#         path = '/var/lib/xend/event-socket'
++#         unix.listenUNIX(path, factory)
++#     if xroot.get_xend_http_server():
++#         port = xroot.get_xend_event_port()
++#         interface = xroot.get_xend_address()
++#         tcp.listenTCP(port, factory, interface=interface)

diff --cc xen/Rules.mk
index d57ca65e5129c4faef9c29b3b2607e49de7227ce,d57ca65e5129c4faef9c29b3b2607e49de7227ce..6756753a2cf3aa6abc36055fdabce526860f623d
--- 1/xen/Rules.mk
--- 2/xen/Rules.mk
+++ b/xen/Rules.mk
@@@ -3,7 -3,7 +3,7 @@@
  # 'make clean' before rebuilding.
  #
  verbose     ?= y
--debug       ?= n
++debug       ?= y
  perfc       ?= n
  perfc_arrays?= n
  trace       ?= n